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

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