Add Moto X+1

Remove some dead devices
Change-Id: I5cc11b61ec59b04cf7f54817a88b3b5ca9ddf2fd