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

Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp

2 files changed, 4 insertions, 0 deletions

diff --git a/test/headless.cpp b/test/headless.cpp
index 86960fb08b..7d18ca451e 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -163,6 +163,10 @@ TEST_P(HeadlessTest, render) {
         };
         const rapidjson::Value& value = it->value;
         ASSERT_TRUE(value.IsObject());
+
+        if (value.HasMember("native") && !value["native"].GetBool())
+            continue;
+
         if (value.HasMember("center")) ASSERT_TRUE(value["center"].IsArray());
 
         const std::string actual_image = base_directory + "tests/" + base + "/" + name +  "/actual.png";
diff --git a/test/suite b/test/suite
-Subproject 2892e261eb6dd8ce42f304e009ef7b2ff5e1a9c
+Subproject dba0f2b1fa749691435d06a251d733173d41e3f