Merge "Use prebuilt llvm tools" am: 1169e31d15
am: c1e66c8d65

Change-Id: I2780998fb3315262e96725b6b67c42c2c9adb7f7