Merge changes Ib14430c3,I5b3982c2 am: 19b60d1811 am: 9017c15666

Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1379765

Change-Id: I9a2ab4ba7aae8bd883658c486edcbea2bb8ec20a