Updated build for Android