Use strong pointers and scope

Rely on strong pointers and scope rather than the more error prone
 incStrong / decStrong approach which can cause object leaks.
No change in functionality.

Change-Id: I1bfc7f0cdeeac022e4120482cd3521e52ffea94e
1 file changed