Merge "Make the linux and mac configs match the device config."