Merge "ART: Increase lock contention thresholds in debug builds"
am: 71ae03b7a5

Change-Id: I7f633964af7934dde92d2cd3765cd09609286ce1