Merge "Use "com.android.media" for linker namespace" am: 7ddc362165

Change-Id: I3948282d658b7a08bd74ba93201adab20438d3b5