am b2305815: Merge "Fix const sp<>& in parameter list and return value"

* commit 'b2305815f04d64a2e6abf672618676bbb197dee9':
  Fix const sp<>& in parameter list and return value