am d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."

* commit 'd2ec8724d2a3407e28161299d44e2e113fe437ec':
  Fix OEM native library path bug.