Fix load media_profiles.xml

Change-Id: Ib8e14a2535c9ffd6d53985e94b0460c2bdf041ff
Add camera parameters header from cm-10.1

Change-Id: I56e320219a3f35e89919d821c8af532ae8d917a3
Resolve conflicts declaration

Change-Id: I7b81f0c7bf85c566142a5d231e9627eb6e5c9e9d