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

Change-Id: I6ed909eacebb1fc83a4ca8957d93315313ee4258