Fixes some bug
Merge branch 'aokp' of github.com:shine911/device_samsung_codina into aokp