am fc06816c: Merge "Add paths to apk!lib/<abi> to LD_LIBRARY_PATH"

* commit 'fc06816cc25f80cc6c4c5d002e5d3bced242a9ee':
  Add paths to apk!lib/<abi> to LD_LIBRARY_PATH