added some Android options based on Config.java file from CLI framework