Merge "Allow for 32-bit VTS builds" am: 5196f93ae1 am: 257e32b6b0 am: a0c6eef63d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2474566

Change-Id: I6d33a4d14d09deaf6a84b0370e0080e1115601fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>