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

Change-Id: Idce0615d0e322c519f32a14ca740647a7b161f64