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

Change-Id: Id2bbf7813480dd68529fe591b6f16f61c525765e