Merge "Frameworks/base: Wall Werror in core/jni"