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

Change-Id: Iee206fd48cd1a82a38d5050cfa9680b2ecb9e894