am c1be19a8: am 37c9b500: Merge "Don\'t extract jni from prebuilt apks." into mnc-dev

* commit 'c1be19a8ee8a2ed7368c178456b73dc380857a15':
  Don't extract jni from prebuilt apks.