Merge from lmp-dev-plus-aosp harfbuzz

Change-Id: Ibd9da468c26988c3e3e1236f5ca5f603be7761bf