Fixes for android.
Merge branch 'master' of github.com:brycedorn/katamari-tokei