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

* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries