Merge "Convert services/core/jni to Android.bp" am: 6a4be8613a am: b3e34fd427
am: 3f5f6b5f56  -s ours

Change-Id: I90c12ddca78a2249aa03f824d7008cc3c7d8332b