Merge "Bring forward libc/libm/libdl definitions."
am: 1f42edda65

Change-Id: I9f27a8c55e934a5b44809989ff89bf97c3f87f58