Initial Android setup & add a new Mac builder and extra Mac config split-out