Merge "Fix deadlock between ConcurrentCopying and thread holding dex_lock exclusively"