carbon edits for togari
Merge branch 'cm-11.0' of https://github.com/BlueEther/android_device_sony_togari into cm-11.0