Merge "Revert "Update HarfBuzz to 2.0.2""