Android CTS 5.1 Release 22 (4181931)
Merge "fix vulnerability in bspatch"