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