Merge "Convert android.os.cts jni to Android.bp"
am: cf720488ba

Change-Id: I4640e243fbf38070b000f3f7a0ff216d5788196b