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

* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.