Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev