Merge "camera 3_4: Fix compilation errors"