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

Change-Id: I932d8af8d08f14873352ccbf52b8bb5585aa0488