Allow building of non-git packages

Change-Id: Id899458c6b72169c6325a97bc92ac0b6aa5f08a0
Merge "Allow building of non-git packages"