Merge branch 'ninja-restat-custom-command-byproducts' into release