am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."

* commit 'aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
  Support LOCAL_CLANG with arch/bit suffix.