Fix hasGlyph() for pre-v23
am: 1b54dfb2b7

Change-Id: Ia4a06d861b46da71a66e250edb755c6778ac2e3b