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

Change-Id: I855b4275f3522a6acf6e99d90b640c72ed8e41d1