Merge "test: Fix 004-JniTest for javac/dx" am: b5f479212f am: 58d4df2050 am: 5f4174e225
am: 08ea4f1833

Change-Id: Iae2cb28bcc55f2c71d0a74137444b9c45852c240