Merge "Use canonical name for SHA1withECDSA" am: 4a0497c
am: fa733d0

* commit 'fa733d0b70b891a04358faac75fc55fb035a98cd':
  Use canonical name for SHA1withECDSA