Merge changes Id639615a,I9509e0c8

* changes:
  Add LIBC_N symbols for libc/dl
  Copy android-23 symbols for to android-24