Better build for Android