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

Change-Id: I5a4515b8d8ab521a81cf6155daa6a8acd182fc39