Use common media profile

Change-Id: Ie639222a5e6e999b1894b36a72f634cd904fb78b
Merge "Use common media profile" into jb3