Merge "egl: Add NULL check for num_config parameter" am: 64990fc0b9
am: ccaf6bf34a

Change-Id: Ifada0489e548bbbfa7378b408a1268b7a7b4da03