Android CTS 5.1 Release 18 (3824209)
Merge "fix vulnerability in bspatch"