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

Change-Id: I98dde7c1093c3422f598ecf30bc4f07318361c3b