Android build target resolve

Work around the build name issues by instead
manually adding the build target for android
builds using '-DOS=android'