[automerger skipped] Merge "Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE""
am: 487ecbfc6c  -s ours

Change-Id: Iadc79dc2ae2f0c0aa52210ed123958d2cba0272f