Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
am: 7382bdf8c1

* commit '7382bdf8c1a755fe20c5979453bfeec0be73da27':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."