Merge "Add libEGL, libGLESv2 into provideLibs" into main