Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8
am: 7a14d95270

Change-Id: I42cf5ca9442728273ff2d90095b6d1520c75762a