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

Change-Id: I3cec0d7a42797d583af7572e556a9d99cf6e5acd