Revert "Damn you Github!"

This reverts commit 2d3992f50598615a5c1ce3688da8492a248582a5.

Revert "Revert "New Android interface and model""

This reverts commit
bb78832aa49d06bebaaf4865ffbce6138d6e66a5.

Damn you Github!

Revert "New Android interface and model"

This reverts commit
361a535c4ecc36d52d146eace78796a7c3e5ab3f.

Revert "New Android interface and model"

This reverts commit
361a535c4ecc36d52d146eace78796a7c3e5ab3f.