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 am: 5d45e50507 am: b64e4a6f77
am: c063cdfb8b

Change-Id: Ie3a7eefdfa0e3d38fa18eba802e2ca7583974aab