Merge "Fix extension name for EGLImage colorspace support." into pi-dev am: 4f8a472cf1
am: 500ba440d9

Change-Id: Ic6d56b0a8f280e1a8b85bd20664a6cb83eb49687