Cherry-pick one upstream patch

The original commit in upstream patch is
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=a3bab162b2ae616074c8877a04556932998aeacd

Bug: 171232105
Test: m -j
Change-Id: Ib9e82430d1c8a232dc7d86848c807948a35ee55e
1 file changed