Merge master branch of https://github.com/XperiaSTE/android_vendor_sony