Merge "Switch to prebuilt clang-3217047" am: 3500ddfe1b am: c3c8abdf2a am: c328dd288c
am: 944bb9aec5

Change-Id: I7a799b03d648341439cae65cff9aa5392e5c37a7