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

Change-Id: I6cf5df3d21575ea49c9bec7fbc2e7f9eb996de13