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

Change-Id: If4699ffa9cd7942e4b7c1eb90278ca20ac1cc191