Merge "Revert "Switch cbmanager to HIDL HALs""