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

* commit 'ca5083195e9bde7379c30ee3507d4e0a5037abf5':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Ide0e78cf5bc08bc98e5a1fbde23045c9a7180a9d