MediaPlayer2: clean up more code

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