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

Change-Id: I880c2daadd1f172be2d727e21de7c287b3324335