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

Change-Id: I3837be802eb62dbafd5307e3d80babadee0079e0