Fix race resulting in UAF in class-define-pausing
am: f6c69e53da

Change-Id: I046f8c2bfdbbe9b4177538cb67bf075e3f35de94