Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev