Merge "MediaPlayer2: clean up libstagefright_player2"