Clean up several build paths

Signed-off-by: Al Stone <ahs3@redhat.com>
FIXME: possible fix to PcdSet64 problem during build?

Signed-off-by: Al Stone <ahs3@redhat.com>