Merge "Frameworks/base: Consistency in core/jni"