Merge "Expose per arch headers." am: 99888af9f1
am: 8711fbb08c

Change-Id: If25ba3a408bbf579cd0d99fcc0da6a8a1087cc91