Android 5.0.0 release 4
Merge "fix vulnerability in bspatch"