Merge "Replace the shared lib dependency to libmedia with header deps" am: c226ea4b06 am: b8765c0475 am: b0b900210d

Change-Id: I69a55f4b5a1f6bb55294013f930ea3913a925b02