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

Change-Id: Ic8f248fa2f70b0e84a97950f61640418566498a4