Merge "Move x86 emulators to v4.1 kernel"