Fix member shadowing warnings
Update linux instructions
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	README.md