Some header layout cleanup and alignment

Change-Id: I3fec1708fb410f8f2f75af39b73646d97a39ff34
17 files changed