Removing more packages again.
Merge branch 'master' of https://github.com/R2Droid2/buildbot