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