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

Change-Id: I654f603c67ab482fa53225b4bcb16a68183fb057