Merge "Fix sanitizer in egl_display_t::get." am: 95e19cda6e am: 66ecc5ef7d
am: 2f5196ac99  -s ours

Change-Id: Ia71b4297595233981a220af9cc93a65b7bc589e0