Merge "Update test cases for HarfBuzz 2.0.2" am: 866a9678d2
am: 2e738cf4ce

Change-Id: I56bc4faa8548f7476309aba13636672124d4cbd1