Updated makefile so now ndk-build will know what directories to search for includes, no longer need for APR
Fixed many circular dependencies (Step 1, More commits like this will come)