Merge \"Switch to prebuilt clang-3016494\"
am: b1beb6f274

Change-Id: Ic0cc4734481cddb87ed8c21d2079ab0645dbcc82