Merge \\"stagefright: use uniqueId to detect same surface for setSurface\\" into nyc-dev am: ecc6049ec0
am: cabaa2cd25

Change-Id: I163bb7b0c2092924ce8961564b41891e264a71c7