Merge "Switch clang-stable over to current Clang build" am: 2793bf6498
am: d8c53a91b5

Change-Id: I048b45109a8229be012d5371bc2946ae459b6a30