Merge "Migrate libEGL to ndk_library."
am: ce1bc304a2

Change-Id: If048759fd60754bd0c7df9c02f33f28a800eaace