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

Change-Id: If1163edd41558f8c4fdcfdfe457cfc665991c160