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

Change-Id: Iefb998a8c9425da80ef89c63228c04bfa6d7d398