merge Xperia Z Ultra SOL24 drivers