Merge "ART: Add stack-dump mode for contention logging" am: d1c983a5bc
am: b78c0b2de5

Change-Id: I54cf640b20d586e4eed8982d26018d72ecc0c24e