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

Change-Id: Ic7f95825b7e55f075c92c7c9c8c1b92797913910