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

Change-Id: Ib48a19c78e4a8256f1d1ef2eb41c33519c751909