Merge from upstream harfbuzz

Change-Id: Ib6dd18e3cc635e9421f3270a273e61a9b7748dc0