am 15d0bc57: Merge "Fix LD_LIBRARY_PATH for host tests after update."

* commit '15d0bc57253f8e586fe1f52d359c753e7e01dc67':
  Fix LD_LIBRARY_PATH for host tests after update.