Better support building normal debian packages

If the package has a debian directory, then there is no need to use the
debian branches.  Instead just build the package.

Change-Id: I1d9a122edabdcd6650168d875bebb334c7473b75
Merge "Better support building normal debian packages"