Old android folder removed.

The changes must be applied after buildbot update only!
Merge pull request #1056 from asmorkalov:android_old_remove