Merge changes I0a744dc7,Id993a70d

* changes:
  media: use size_t for integer iterator to Vector::size()
  media: 64 bit compile issues