test revert: Fix for default USB debugging in eng builds.