Merge "android-21: add version scripts for libc/m/dl"
am: c67f5d0539

* commit 'c67f5d05398f97fdce6649ef4720fd639a53c9b2':
  android-21: add version scripts for libc/m/dl