Merge "MediaPlayer2Impl: fix getBufferedPosition" into pi-dev
am: 2e94d509b3

Change-Id: Iea80c12708fce69efbd5347144a486d3a881f959