Work around reversed architecture specific includes am: adfc0a1a32 am: e5e4c49907
am: 1c444ad862

Change-Id: I896f8868e70395fca3ff9ac2649fb8ede6893ff1