Merge changes Id639615a,I9509e0c8
am: 6980f5dc5e

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

Change-Id: Ic95fa1f1ee9a15e9e34d7c7c2baac3aa957ddd2c