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

Change-Id: I66c9354f7360def6a1225f77fc5a2748b13b7d09