Merge "Revert "Add option to disable linking of libcxx into fuzzer""