am 92363543: am 57ea96a4: Reconcile with ics-mr1-release

* commit '923635436b0cd3392f3aa9328a4a855e5000dfb5':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit