+android build; style and includes fixed somewhere;