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

Change-Id: I19d3c7b17fa82b5f1034d035c285af35cbff824d