Revert "aosp -> Omni, full -> omni"

This reverts commit a5102c49b25d71b6b7fb0eda231f639e6cec70ac.