Merge "Error on USE_CLANG_PLATFORM_BUILD=" am: 7b31dd1094 am: 893f32053f am: ca5083195e
am: 66af4a3382

* commit '66af4a338232380b28720293cf27c80c73e27948':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Ib25b369f0b0993f936273a28be1b50b0500a4095