Merge "Adjust for library rename" am: 2524ba06a2 am: dba75688eb am: 2412e037ee

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

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