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

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

Change-Id: Id706b23aa02950655917951bf36cf8115f642419