Android: Make git commit and build type string optional in version regex