Android 5.1.1 release 20
Merge "fix vulnerability in bspatch"