Merge branch 'master' of https://github.com/Nutomic/syncthing-android

Conflicts:
	build-native.sh
	build.gradle