Merge "Use "com.android.media" for linker namespace" am: 7ddc362165 am: 2c17692ac0 am: 54f64ad365

Change-Id: I0ff769e4868682d3ccaac5086cfd196d3b96509d