Fix some merge issues.

Author: bhackett1024

build.js

@@ -18,7 +18,6 @@ if (process.platform != "win32") {
   fs.writeFileSync(
     `${gecko}/toolkit/recordreplay/RecordReplayDriver.cpp`,
     `
->>>>>>> windows-port
 namespace mozilla::recordreplay {
   char gRecordReplayDriver[] = "${driverString}";
   int gRecordReplayDriverSize = ${driverContents.length};

mozconfig.windowssample

@@ -0,0 +1,14 @@
+. $topsrcdir/browser/config/mozconfig
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/rr-opt
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+mk_add_options AUTOCLOBBER=1
+
+ac_add_options --with-branding=browser/branding/recordreplay
+ac_add_options --with-app-name=replay
+ac_add_options --with-app-basename=Replay
+ac_add_options --enable-replace-malloc
+ac_add_options --disable-sandbox
+
+# This is needed to use -fno-omit-frame-pointers during compilation.
+ac_add_options --enable-profiling