Merge "Add odm/etc/media_profiles_V1_0.xml" into pi-dev
am: afb0d8c57e

Change-Id: I865012b3fb17efae6ae0ee62bad40497eb959d96