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

Change-Id: I4da29156b4f6bd209fa106bafd08f11450905e2f