Merge "ART: Ensure correct thread state for stack trace collection"
am: 2c2e723f1b

Change-Id: Ida9e993c408b0a62b20520319f995adf7bdf7bd5