Bjarni R. Einarsson Rework slightly Android PR