cherries: update cherry-picks needed for 2011 Xperias

Also update gerrit accounts in comments

Change-Id: Id05b16f5b5b69ba1b6037905b05cbf3535b3b8c8