2011 Xperias: update cherry-picks

Change-Id: I29999d8e9799c422df7b5e950cf51cf554b6bef1