Merge harfbuzz update from master

Change-Id: I9accefcdfd1b63624e23bbc1ee58bdc12876cf4e