togari: Clean up old cruft

Change-Id: I43f682b342d0f69c767562a87b88f005484df5c4
togari: merge Sony 4.4.2 changes

Change-Id: I0bf3ef4d584a1bb966c8ff4780449471ba7a4f86