Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."