[automerger skipped] Merge "Remove hidl VNDK libs" am: fb220803 am:...

[automerger skipped] Merge "Remove hidl VNDK libs" am: fb220803 am: 7ec502ed -s ours am: 104cd073 -s ours am: 5acc9346 -s ours am: 304fe368 -s ours

am skip reason: Change-Id I25a787defb1755107c0538eabd21a0bfcf8374b1 with SHA-1 37aeef03 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1355675

Change-Id: I9ddfe005dff9372994bfd988baa32179005ffcb9