Merge "Fix missing includes in camera.common"