am 7a006aea: am a9151741: Merge "Fix inline assembly for clang"

* commit '7a006aea535c052ed77e6f1c34081b599835a8c8':
  Fix inline assembly for clang