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