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

Change-Id: I23c24f5a0ddcb3c93ab67d8fff0a1b23fc776cc1