merging the latest changes with the most current CM repo
Merge branch 'cm-11.0' of https://github.com/xNUTx/android_device_sony_taoshan into cm-11.0