Merge "MediaPlayer2: fix a regression from I5d4884353057a195b1f587694"