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