maint(build_library): Remove special case code for -usr disk layouts

More cleanup now that amd64-generic is gone.
Merge pull request #235 from marineam/clean

maint(build_library): Remove special case code for -usr disk layouts