Merge "Unbundle android.jni.cts." am: a24601a76c am: d225ff0c94
am: de30cfb81c

* commit 'de30cfb81c938611adc6476d0352659a96bf262d':
  Unbundle android.jni.cts.