Revert "Revert "Revert "Revert "Android App""""

This reverts commit b25fedec2cda4de47c8ef7ccdba951e4e8fe2d91.