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