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

Change-Id: I39e5e01ac024e56a9d17811024c2ab33accec574