Manage files in android

This reverts commit 5302c5719cba326689e712481959fd53ec4c65af.