2011 Xperias: remove some cherry-picks

Change-Id: I7eca6412ec8aea14ae5ce9fac0847f261f6f374f