Merge "Make jni_internal_test a CommonRuntimeTest." am: c55a1a260e
am: 3a4389dafe

Change-Id: I2c957f2613882038a2cef804f71e30c9d98a7eb5