Merge "Fix for native bridge fallback in egl layers"
am: a0a5ed3bdb

Change-Id: I5d281eca0e352b512939a191f99bb55a26f8b33d