Merge "Migrate libEGL to ndk_library." am: ce1bc304a2
am: 183edbb062

Change-Id: Iff01a29d4b03a45a5b28a6f98f93eb4af3e00ad7