Merge "Don't build `bspatch` executable for Android target." am: e36af14afc
am: 6c325a227e

Change-Id: I114a128a7a17bd4b429803d7160dec645fd8055a