Update Android build steps