Merge changes Ib14430c3,I5b3982c2 am: 19b60d1811

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

Change-Id: Ie5903190ea426c0d130b863279cb8a61a5262037