Merge "Run bionic/libc/tools/genversion-scripts.py"