Revert "add full userdebug"

This reverts commit b0f5fbbb66fbee1f551e9ff2d2793891119da025.
Revert "try something different with omni setup"

This reverts commit 8d77fbeefb5b6b41c39a3be57aee74f9c3bac302.