Merge "Switch to clang-r365631b"
am: f0d4545583

Change-Id: I1687bde689227f795747a2d0a213f59af5670f0a