Merge "Fix memory leaks in libsurfaceflinger_unittest" into sc-dev