Merge "Revert "Fix MediaPlayer2Test on 32bit mode""