serrano: Various updates and fixes to media profiles

Change-Id: I731a072b911d1e2010762ec0779fabd85de1c301
serrano: Fixup media profiles

Change-Id: I048243c5257d11e325dbcdeb25e5638a5e211e41
Merge branch 'cm-11.0' into kk_mkt