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

Change-Id: Iac8c439af0e8f0d295b28c43979699eb9963510e