More Android build system stuff