am 52646559: am c06307cc: Merge change 24583 into eclair

Merge commit '52646559afa672dc261c02067771501bdfb77783'

* commit '52646559afa672dc261c02067771501bdfb77783':
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.