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

Change-Id: Ide17103285675381f62486d5978aa805f9514936