More Android-related Makefile cleanup.

Perhaps we do need an ALL_CXXFLAGS or similar.