clean-up EGL includes

Test: compile and run
Bug: cleanup

Change-Id: Icb6c70c80d455446d7163a20d51c41d9b6e0b578
14 files changed