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

* commit '29b415aa7781b27fc4948307acc5961cd702dac2':
  Allow -mcpu=cortex-a15 for clang