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