library + test
Merge branch 'master' of https://github.com/mapbox/mapbox-android-sdk