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