Merge "stagefright: do not reconnect surface for tunneled playback" into oc-dev