Merge "Fix jni_internal_test dependency."
am: 35dc0b5874

Change-Id: Iff08963498751e515fdf61baa95a89b588cba4d5