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

Change-Id: Ic26c025b5edae7867795c38074e6314b75d75d89