Merge "Fix race with host_dlopen_handles_" into nyc-dev
am: c87c9bf620

* commit 'c87c9bf620467169fd12507a7b1f6f3dc1b34f77':
  Fix race with host_dlopen_handles_

Change-Id: I603921d07bd8227d939486499549e707469abe42