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

Change-Id: I55e2e09c1381548470c52e7f89c28db70f5709aa