Merge "emulator: uses 4.14 for x86[_64]"
am: b75ea5eb23

Change-Id: I63365af46398e354fbe70fbdf99a582fa63fa06d