android build-system mainly working
fixed missing includes