MediaFile: support more media types

Change-Id: Ib3109c5ebc762b97e45bd0bb5fa82ad77b0e6822
Merge remote branch 'cm/cm-11.0' into cm-11.0