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

Change-Id: Iad3d2edb1d721bf48a0c77430e16ec1db9a413be