Merge from upstream harfbuzz

Change-Id: I4feba5e1b841b0325ca00cdb6e4964b1e0256fdc