Revert "merge in local changes"

This reverts commit dbbbb21b9a4f0d0c5cf96ab3082e350f36e8ccbd.
Revert "add support for omni builds"

This reverts commit 4fadf7863af78c674b3b6f5cb5d623b7831f077e.
Revert "initial bring up for omni"

This reverts commit 6814807e5cc4ce05dafa15de447000a3b79432c8.