[automerger skipped] Merge "Add stubs to libEGL cc_library" am: a8b8267d am: 3090ad62 am: 794c2fc4 -s ours
am skip reason: Change-Id I73a8e9bac02cc4c6874c140ff55b328334f5d309 with SHA-1 e8141516 is in history
Change-Id: If2f9a9430049bf6eba24d745c18b7beecb740f3a