Merge "Use -Werror in cts/tests/tests/jni/libjnitest"