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