Revert "back to udb...."

This reverts commit a0a0f58305cb143c435555f10c02c374be6d74f9.
Revert "user, not userdebug..."

This reverts commit 724ab85b755f7bc7c2ec84591c09385c9d0c8aae.