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

Change-Id: I59f712f7ee90fcdb0a8719504570d3dd1650cf18