Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"