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

Change-Id: I4597c8ad7286d1addcc88e1e37b8b08177a5e824