Merge "32 bit kvm is deprecated." am: e862cfa113 am: 7233cfe8da am: 22ff4c65a2

Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951

Change-Id: Ibbe40f7f02a7ee53943cf1c6327ffd8e42bff112