Android 5.0.0 release 6
Merge "fix vulnerability in bspatch"