Merge "Update HarfBuzz to 3.1.1"