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

Change-Id: Ie56eca7f1f5a678c9065a4f3de6a869df2900d39