Merge "MediaPlayer2Impl: fix getBufferedPosition" into pi-dev