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

Change-Id: I4a4a4f1d70012375d5772e97dd23301231734f6b