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

Change-Id: Icde1d5dc8ca191b752097e85cfb7e94857bcb27b