Merge "Remove MediaPlayer2" am: 2e51cefc7e am: 068d3c7ec3
am: 41d2d5417f

Change-Id: Ia51017c7741a771452bc7942bb84f1e661988b2d