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

Change-Id: I9f06803d1d1b18036d0a7e1993746e1a36f96837