Clean up Android makefiles and fix warnings