Reverted previous commits
Merge branch 'master' of https://github.com/XperiaSTE/android_hardware_semc