5.0-10950 vs. 5.0-10947 / ogl-lin-mesa / chibi-robo-zfighting

5.0-10950 (dba7f330) Diff 5.0-10947 (86bf88d5)
Failure ac58b74d6a355e9200c96d4f22a4f822c508b2ac
Failure f6942a2c9d25b9be0782294660c1c41322cbec31
Failure f6942a2c9d25b9be0782294660c1c41322cbec31
Failure 67cb3159a2245b16f6aa05804986090f7deeeb1a