Updated version of Android main app and android test
Updated version
Updated version
Updated version