Added extra defines in order to match android implementation hacks