Move Android SDK installation to machine/pre step