Misc APK hotfix
Merge branch 'i9300-cm-experimental' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental