am 7acd4a5a: Merge "Revert "Don\'t extract jni from prebuilt apks."" into mnc-dev

* commit '7acd4a5afdecf883fb83a39b30715ad3d408e50c':
  Revert "Don't extract jni from prebuilt apks."