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

Change-Id: I7beb1a00ee52698118738df74455290d04013c8a