Merge "Fix deadlock between ConcurrentCopying and thread holding dex_lock exclusively"
am: a13ec54791

Change-Id: I6649110987b3070ed8131130f26e2a6c6b0668b6