Merge \\\"stagefright: use uniqueId to detect same surface for setSurface\\\"...
Merge \\\"stagefright: use uniqueId to detect same surface for setSurface\\\" into nyc-dev am: ecc6049e am: cabaa2cd
am: 921d74fb
Change-Id: I6dd65d208ab973df187e9e00d385e773b0974296