Old android folder removed.

The changes must be applied after buildbot update only!