Merge "Camera: Fix remaining OWNER file include" into qt-dev
am: 9aec56107a

Change-Id: I4447ac95f80a1381c964e8818d1a1cd449cc104a