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

Change-Id: I82fdc4c200f03fa09cdf39fe34c738430bc70ee4