Properly update hashes
Fix a check in the binary comparison scripts
Readd and update the accidentally cleared SHA1 test tables

These were accidentally cleared in 5ab5fe15, when the script
for updating them was broken.
Merge pull request #1628 from mstorsjo/fix-tests

Fix binary comparison scripts and tables
Merge remote-tracking branch 'upstream/master' into travis.android