[backfire] mklibs: merge r31259