Update android to 31#3

udfvirus wants to merge 5 commits intomasterudfvirus/Android:masterfrom

javavirys-patch-1udfvirus/Android:javavirys-patch-1Copy head branch name to clipboard