Merge "Convert services/core/jni to Android.bp"