am a2f441b8: Merge change 21613 into eclair

Merge commit 'a2f441b8c6781472deb5da0b27c3b5c81114299a' into eclair-plus-aosp

* commit 'a2f441b8c6781472deb5da0b27c3b5c81114299a':
  add optimized SHA1 algorithm