Merge "Handle glGetString returning NULL"
am: 329904ffb2

Change-Id: I4c86b693f8986b96e127b0c410cd3912543d8956