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

Change-Id: I1009714d699b3b4cba0ac2ade3085d3007d51d1d