Merge "Merge "Switch clang-stable over to current Clang build" am: 2793bf6498 am: d8c53a91b5 am: c6fa0f61ec" into oc-dr1-dev-plus-aosp