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

* commit '5b4618897e6e6fda29600d66a74d0f3f1024338a':
  Fix LD_LIBRARY_PATH for host tests after update.