Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev
am: f9c8893d1b

Change-Id: Ib84918cf6e12392fc58500d47feeb38ab28b7d43