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

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