2011 Xperias: switch back to arco

Change-Id: I5a06c605a490e955e5f626689a60ed3a1676495a
Patch Set2: move legacy stuff to add/removes
Patch Set3: looks better