Android CTS 5.1 Release 24 (4340933)
Merge "fix vulnerability in bspatch"