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