Merge branch 'js/fuzz-cxxflags'