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

Change-Id: Ifaa0bb52df3c7a83147c00692f014bba2078f9a4