Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb am: edac7f768a am: 3a706894c4 am: b0cc8a72df am: 9b84b3b8f2
am: aa1082ffd7

Change-Id: I5f789dc4c9c4608c53ab49604bf97bae5637716e