Fix repoman errors
Merge branch 'hotfix-deps'

Clear repoman errors and depend on anything other than -base-r0.