Merge "include the mutiple Ubuntu distro and architecture"