am 93a829bd: Merge "Remove usage of LOCAL_BUILD_HOST_DEX"

* commit '93a829bd9c0cc45170e6379e95304e3d2fa61d0c':
  Remove usage of LOCAL_BUILD_HOST_DEX