Android build system improved