This should fix it, ugh what a mess
Merge branch 'master' of github.com:Bloc/android-source