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

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

Change-Id: Iaa300b96fcef2d5782316109bf247b5e05935de8