Merge "egl: add EGL_IMG_context_priority to the whitelist" am: d94925cf3c
am: 666bbed016

Change-Id: I1ca208b7a497fc2d08b647a67659538f441b503a