Sync on Zeranoe tools, fix x264 dependencies