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