Merge "Handle glGetString returning NULL" am: 329904ffb2
am: cbd23648b6

Change-Id: I4760c13b20c4e8ac080ac6cc99840db670841aaf