Merge "Adjust for library rename" am: 2524ba06a2

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

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