Merge "Fix jni_internal_test dependency." am: 35dc0b5874
am: 2e3cdee56c

Change-Id: I8c459b09cc0610674136c50f7227486150549e85