Merge "Deprecate HIDL cameraservice"