am 366f2e61: am e05e02e1: Merge change 24094 into eclair

Merge commit '366f2e61fe78488f1a01187cbdb2e1a8e776777c'

* commit '366f2e61fe78488f1a01187cbdb2e1a8e776777c':
  Add basic metadata retrieval support for midi, ogg, etc.