am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd':
  fix vulnerability in bspatch