Made system ready for Android deployment.