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

Change-Id: I50f292d7b18c093d77b87d73534142d8dff9579a