Updating mapbox-android-sdk.jar to include the merged code from today's mapbox/mapbox-android-sdk:master into bleege/mapbox-android-sdk:jarbuild