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

Change-Id: I6ee483508d26507a626c7fff4d3718c28bc0525b