Merge "Distinguish between host and device x86."