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

* commit '09d77363b434071784398589bc932b122b4d45b3':
  arch-specific diff of header