Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev