Merge "ART: Clean up Thread"
am: 8205d17159

Change-Id: I2b8c53bf300ae245161a3a1f5654b56fb4e961ef