Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308

Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020

Change-Id: I08832c8ac18fca8741801bd0ab06c814156bf24b