2011 Xperias: Switch to CM display-caf and media-caf
Add some cherries

Change-Id: I9357bf8b3c1527756330bb683bb7606194975bd2