Merge pull request #6387 from mahdihijazi/fix_build_no Android: Use the git rev-list --count for versionCode
