[automerger skipped] Merge "Shifting VTS libs to static_lib entry" am:...

[automerger skipped] Merge "Shifting VTS libs to static_lib entry" am: 241327c1 am: 939cb092 -s ours am: 595975fa -s ours am: 4daea482 -s ours

am skip reason: Merged-In I0f8dea081a51256cfb0e50d6af20038e2b8f1f07 with SHA-1 38dd36ea is already in history

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

Change-Id: I437495b3a49300c2c9364d80a628ca9cb61ce1ba