am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."

* commit 'b9b2d21c04d0ba65ad56a26f8306e9afa7d99694':
  Add local Clang+target specific flags.