Merge "Override AIDL CAS HAL if HIDL is built" into main