[build] Improved version name logic
Merge branch 'build' into android.
Version name logic.