Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1