Merge \\"Use more prebuilt build-tools\\" am: 6c0c720389
am: ffb643e487

Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c