Merge "Add stubs to libEGL cc_library" am: a8b8267d85 am: 3090ad6281

Change-Id: Id88bb70a99bff4fffc45e71f59fa68f610a9b155