Merge "media_plugin_headers: Add host support" am: 3e3cdc9b33

Change-Id: If72e7d3a4216646bb2f4f592f9116d93253842c4