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

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