sync with kumquat changes
Merge branch 'master' of https://github.com/AndroidOpenSourceXperia/android_device_sony_lotus