changes for android compiler