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

Change-Id: I6e99058d1122fad6a723662ad98d9e33c060e34c