Merge "Revert "Revert "Update HarfBuzz to 2.0.2""" am: b20ee793e0
am: f6c9bdf72a

Change-Id: Ib7ed0db777bc318f1a73e11223efdbd6fd29eca7