Cleanup x86inc leftovers

Change-Id: I732d6942d56042a79c4259f775a6045fa95fbeff
3 files changed