checkstyle fix
Merge branch 'master' of github.com:mapbox/mapbox-android-sdk

Conflicts:
	MapboxAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapController.java