4.0-7943 vs. 4.0-7941 / ogl-lin-mesa / chibi-robo-zfighting

4.0-7943 (5d1f78da) Diff 4.0-7941 (3b1375f7)
Failure 4bb694ea992833dfbe7c6a7159d7e84b826e08fd
Failure d5bc011eb4fffa9ff5c17152671f21ce0fa2ed09
Failure d5bc011eb4fffa9ff5c17152671f21ce0fa2ed09
Failure 614c6ff88eca3f35d3bc32982055b16361d00aaa