Merge "CameraDeviceImpl: Fix import warnings."