stage 2 of upgrade hw + egl folder