Updates.
Merge branch 'cm-11.0' of github.com:uberlaggydarwin/android_device_sony_taoshan