Merge "Camera: Clear cached HIDL references"