makefile.android now adds -D__ANDROID__ to CPPFLAGS
Merge branch 'master' of https://github.com/Frontier789/Flib