am c770cf69: am 4d52b215: Merge "Move roundup from frameworks/av to system/media"

* commit 'c770cf69704a6a81f0e854d26b620ad0b87cf76e':
  Move roundup from frameworks/av to system/media