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

Change-Id: I341c83cb017725a3a31a7378079ef400338fcf57