Merge "test: Fix jni_compiler_test for const correctness" am: 2b31c0ac03 am: c64c485078
am: e967e00e77

Change-Id: I84e00cac4ff8403f9dc413f9c554b7980cf94881