Merge changes Id639615a,I9509e0c8 am: 6980f5dc5e
am: acb23bbcb2

* commit 'acb23bbcb20690a7907e6966a6faa423b132aa40':
  Add LIBC_N symbols for libc/dl
  Copy android-23 symbols for to android-24

Change-Id: I3fc55b89bde75a274addbc665c05f6d966a35dc0