am c8a4b555: am 81631c6b: Merge "Little fix for headers comparison tool"

* commit 'c8a4b55563d2cdd08ccb97c0c911033e6cfb3a86':
  Little fix for headers comparison tool