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

Change-Id: Icdd858438f168551260cd0b4b10de1fe5087ec22