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

Change-Id: Ib536d9391ccf3544de0963d7b8106222651bf2d1