Small fixes and update rosinstall to use VikingX forks
Merge branch 'release-1.0' of https://github.com/adamantivm/roscpp_android into release-1.0