am aa94389b: am d95e58cb: Merge "Load libraries directly from apk"

* commit 'aa94389ba2f848a98c74b439da6ea8c3329668ce':
  Load libraries directly from apk