am 7d80bf6a: Merge "arch-specific diff of header"

* commit '7d80bf6ab4e0df5049ccfc241bfb1408bf2e2931':
  arch-specific diff of header