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

Change-Id: I7cb79d6cdc8002d02ae79fdddf3ba91e3a33a67d