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

Change-Id: I5a805143632860de6270a74dc76c015bac3b1113