am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit 'd4592694b41d5f8309d98cd3312b5486216cc685':
  fix vulnerability in bspatch