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

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