...
Merge branch 'master' of https://github.com/SayCV/sigar

Conflicts:
	src/os/android/linux_sigar.c