Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev