am 57ea96a4: Reconcile with ics-mr1-release

* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
tree: 213424db0d71f1de94ea2789d272595287664bf6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/