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

Conflicts:
	src/mbgl/map/map.cpp

src/mbgl/map/map.cpp

@@ -160,7 +160,6 @@ void Map::start(bool startPaused) {
         terminating = true;
 
         // Closes all open handles on the loop. This means that the loop will automatically terminate.
-        asyncCleanup.reset();
         asyncRender.reset();
         asyncTerminate.reset();
     });
@@ -184,11 +183,6 @@ void Map::start(bool startPaused) {
         }
     });
 
-    asyncCleanup = util::make_unique<uv::async>(**loop, [this]() {
-        assert(painter);
-        painter->cleanup();
-    });
-
     // Do we need to pause first?
     if (startPaused) {
         pause();
@@ -361,12 +355,6 @@ void Map::swapped() {
     rerender();
 }
 
-void Map::cleanup() {
-    if (asyncCleanup != nullptr) {
-        asyncCleanup->send();
-    }
-}
-
 void Map::terminate() {
     assert(painter);
     painter->terminate();