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 am: d373dd0154 am: a6e6e7c5da
am: b5485e3455

Change-Id: Id0993358986ee29f23dabd19584d8fd0ea378f1e