Merge "Cleanup x86inc leftovers" into nextgenv2