Android 5.0.0 release 3
Merge "fix vulnerability in bspatch"