Revert "Finish fixing Zygote descriptor leakage problem"

This reverts commit 483a9c818fd977e3641298af6689b4fa173134fb.
Revert "Base: add OmniSwitch NavBar shortcut (1/2)"

This reverts commit 8876108da53f669c6af9aaff0e5f23d18d471090.
Fix up more build errors