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

Change-Id: I0f39fb179a066e02879d9ba6309f8fae385666be