Merge "Remove usage of LOCAL_BUILD_HOST_DEX"