Merge "emulator: switch x86* to 5.4 kernel" am: d7081eca99

Change-Id: If53f62c8f86ef51ca39a3a87db9e8f1ed3d6869f