Merge "Add libmedia_headers library." into oc-dev
am: 0a09b4c424

Change-Id: Ib7475df528917ab9840a00cee03cda884a270c77