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

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

Change-Id: Iee4c3ae3f0d9134dfa8998e70a0fb2bd204cfb6b