Merge "MediaPlayer2: clear MediaDrm objects upon close/reset"