Merge "sf_foundation: include media_plugin_headers" into pi-dev am: 1f03085b59
am: a0f877800a

Change-Id: I74a59825e132bab7f4fb41b8dc331b91b603d3c2