am d95e58cb: Merge "Load libraries directly from apk"

* commit 'd95e58cb609228c4c4b231e00d6bb648e9dcaf71':
  Load libraries directly from apk