Merge "Revert "adb: detect some spin loops and abort.""