Android build fixes/cleanups

These small changes fix a bunch of small inconsistencies in the android platform makefile, and simplifies it a little.