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