Merge changes I16000c0c,I325003cb

* changes:
  Add two locks to expected_mutexes_on_weak_ref_access_.
  Revert "Add jdwp event_list_lock_ to expected_mutexes_on_weak_ref_access_."