Merge "fix vulnerability in bspatch"