Merge "Frameworks/base: Fix services/jni warnings"