Merge "Fix race with host_dlopen_handles_" am: 1bba7c22b1
am: 91a4dc7435

* commit '91a4dc7435de4af9ae12f3205b272cf62913e87e':
  Fix race with host_dlopen_handles_

Change-Id: Iadf9d3fbc7f31c7d9f0d16bf4363e8f180988acc