Bug 991393: Enable flame builds on trunk r=aki