Merge "Revert "Update prebuilt libc++ and libclang-cpp filegroups"" into main