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

Change-Id: I2566e7932d0f1b2653c795d3a25d5f2a0b8cd6d4