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

Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp

android/mapboxgl-app.gyp

@@ -24,7 +24,12 @@
       ],
       'variables': {
         'ldflags': [
-          '-llog -landroid -lEGL -lGLESv2 -lstdc++ -latomic '
+          '-llog',
+          '-landroid',
+          '-lEGL',
+          '-lGLESv2',
+          '-lstdc++',
+          '-latomic',
           '<@(png_ldflags)',
           '<@(sqlite3_ldflags)',
           '<@(openssl_ldflags)',