Merge "Run bsdiff tests in presubmit." am: 69e0da7fdb

Change-Id: I64a52da0dbf24a6763fea3147e17612ae141857e