Merge "Remove MediaPlayer2"
am: a63468a847

Change-Id: If4bb1436ca9e71400831e133b65926a4a5a5e86a