am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"

* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
  Allow -mcpu=cortex-a15 for clang