Merge "Fix sanitizer in egl_display_t::get."
am: 95e19cda6e

Change-Id: I902304c4877aac7926d30c4fa85ce49320da12cb