Fix style issues
Merge branch 'master' of github.com:mapbox/mapbox-android-sdk