remove label
Merge branch 'master' of https://github.com/karolijn/CP317
fix android build
Merge branch 'master' of https://github.com/karolijn/CP317
fix build
Merge branch 'master' of https://github.com/karolijn/CP317