Merge "Remove more remnants of MediaPlayer2" am: 0cbbcc6f02
am: f418196d42

Change-Id: I8359a1601e69b3f3337b569cf861b019315e0e31