Merge "MediaPlayer: add a disconnect from ANativeWindow"