Merge "Remove unused code from the thread scanner." into dalvik-dev