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

Change-Id: Ibab38bb72fdd60f0f5feb4e6cf2c0b15b5c0ec29