cherries: remove merged

Change-Id: Ie3c83597170edf48c5d60345202ad8c9390c4348
2011 Xperias: no more add/remove

Change-Id: I43abe28bc44e2aefdb0e21d7ffef46ac3939e1d3
Merge "2011 Xperias: no more add/remove" into pac-4.4
Merge remote-tracking branch 'upstream/pac-4.4' into pac-4.4