Android 5.1.0 release 3
Merge "fix vulnerability in bspatch"