Merge "ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'"