Add Moto X and Moto G

Plus remove some duplicate interface definitions.