Merge branch 'develop' of https://github.com/secure-software-engineering/soot-infoflow-android into develop
Merge branch 'develop' of https://github.com/secure-software-engineering/soot-infoflow-android into develop