Ion: Update supported media types

Change-Id: I7d616c0c47abbf2c34b4bc5c923cfd294600bd56
Merge branch 'cm-11.0' into stable/cm-11.0