Merge "Switch to clang-r383902" am: a0ba9fab45 am: c8baaa410e am: 0dffe3ada2 am: b0cab71124

Change-Id: I0463304a164c52f9e441f151ae2e29b61bdba378