Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1