am 798c8430: am 3c6e4910: Merge "Fix HOST_LIBRARY_PATH."

* commit '798c8430d5d5389e15379d64119dfc75cfc61ff8':
  Fix HOST_LIBRARY_PATH.