Merge "lshal_test uses static libvintf." am: 9e4245bd22 am: 96543bb1a5 am: 1fe487ccea

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1515339

Change-Id: I17b90e50f3f8e243ea8fd830766be82ee472b389