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

Change-Id: I84062950a597ff3e692502037ec31b3b558f16df