nicki: misc
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into nicki-cm-experimental
Nicki still can't use .odex