Clean up makefile

This is an initial cleaning of the main Android.mk

End goal is a totally clean and c99 standards