This seems to be breaking ADB in recovery.

Also, whitespace fixes.