Merge "Remove MediaPlayer2"
am: 2e51cefc7e

Change-Id: I43f2b99b916bf989025d01495c0d8eeb73762886