Merge "Revert "Remove external/libcxxabi in favor of prebuilt"" into main