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

Change-Id: I4ae2542b6ae180ad8133e942b6b05beb7d6e407a