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

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

Change-Id: I0995fdba8eb16fc88f8b9e36ab4e8ed712fb372e