Reworking a couple devs

Change-Id: I4db0af669c56cfd5e8e39e104afff87d8f0001f7
Removing xperia 2011 devices from official lineup

Change-Id: If8139826cc8ef7d4d9a518c694e4e396dcd34081