Work around reversed architecture specific includes
am: adfc0a1a32

Change-Id: I27766bd2683bf4b968ffbcfc99dbd65dd152d468