am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d

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