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

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

Change-Id: Ide90ab285f0e3a7da144f0bb5eaadad64b85b98b