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

Change-Id: I336ae24f31e3435914876edb06fbb198f9417cfd