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

Change-Id: I3f3c8855b33b89d055aa901e830b2a2419891884