Android CTS 5.1 release 4
Merge "fix vulnerability in bspatch"