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

Change-Id: I6cba69a16581e322342a577c05b1fff051db53ab