Merge "Error on USE_CLANG_PLATFORM_BUILD="
am: 7b31dd1094

* commit '7b31dd10948abccc9c8b2f949edbe84de15702d5':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Iea742a5cd8230587656460cc5ad6b979ba2189a5