Merge "Docs: Map Android to Ubuntu and Mac OS versions"