am b116db59: am 69d57a89: Merge "Use HOST_LIBRARY_PATH to access host shared libraries."

* commit 'b116db59e312c46134459ebb54a7f121d2934999':
  Use HOST_LIBRARY_PATH to access host shared libraries.