Merge "Small fix to MediaCodec"
tree: 40f768945ee6cac5d11fec9cfb535a2c3def7070
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/