Merge "Switch cbmanager to HIDL HALs"