Merge changes I4a53a0cc,I053d0686

* changes:
  Add FlacExtractor to MediaParser
  Fix MediaParser sniffing