Merge "ART: Add thread dump to dex2oat watchdog" am: 888dd09736
am: 502149f10d

Change-Id: I14f38aba7793fdde411175cb8c68636d9b6f5dc7