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