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

Change-Id: If8f28651d98edfe3b193b88f96f9fc09741c0b88