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

Change-Id: Ia81ffff2e54f90f9861792df575951b054dec479