Merge "Remove HAVE_DLADDR from AndroidConfig.h."