Merge "Convert services/core/jni to Android.bp"
am: 6a4be8613a

Change-Id: Icbb98c844347418c003a75d80394448cacfb036f