Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason