Merge "Switch to clang-r365631b" am: f0d4545583
am: 6cb0e045e0

Change-Id: I0056f50f78583d68eb12de3ebb9aba07f6011c80