Use bspatch as a library. am: 7a65909568 am: bae1ec2e7a
am: 941ef20b3e

Change-Id: I5c91e9b03b839fe3dadcfdb56035eb6fea6fa5ef