Merge "Switch to clang-r383902" am: a0ba9fab45 am: c8baaa410e

Change-Id: I25f23bd8f558944b4826ba56ffd00d750a04ecbf