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

Change-Id: I1b7aa2d94c1ea863a003443ef01d5712013b40e6