Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7' * commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7': support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7' * commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7': support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl