am 3c6e4910: Merge "Fix HOST_LIBRARY_PATH."

* commit '3c6e4910a6646e36425e5c6ea4b7cc4bee47b6ca':
  Fix HOST_LIBRARY_PATH.