MediaPlayer2: clean up code

Test: cts
Bug: 112549021
Change-Id: I5c5d76491c7d543390276f370a6d0830fec0ae15
3 files changed