Merge "MediaPlayer2Impl: fix several functions" into pi-dev