Merge "MediaPlayer: add ANativeWindow (dis)connect calls"