Clean up
Merge branch 'cm-11.0' of https://github.com/aapav01/android_device_samsung_ms013g into cm-11.0