pr-13222-08f6f1 vs. 2412-31 / vk-lin-mesa / nsmbw-intro

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure eb3786d95f7dbcda7b8a3937c12fdee74496c96a
Failure 1ff74ea1ef4d870c20bc2cf79f854a48a1aa94ce
Failure 5fa78057dfbd8c47eca1e2a846bdc1c6c63b6840