merge in ewemoa's zipalign fix with my updated build-tools

now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !