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

Change-Id: I9eeb0e7e63b2a0fc8873c119ba62c0fb7ade8b37