am 91b81daa: Merge "Remove usage of LOCAL_BUILD_HOST_DEX"

* commit '91b81daa60b50c915d5ac032bda4a3d8050695b9':
  Remove usage of LOCAL_BUILD_HOST_DEX