Merge "Fix javadocs in CameraDevice"