Merge "Remove temporary hack from gl2ext.h header." into pi-dev am: f074747349
am: 63feee914f

Change-Id: I292f42d0fdccf21ff4e97ef73502fb5434f7f04c