Squash commits

Change-Id: I634e1f316fc70fba663db007f80645eb15f74817
Add egl config here

Change-Id: I353533c5e334353d8336680fb0f407276a274794