Revert "Unbreak several merge derps in native and update"

This reverts commit 68f3515b41873bf9e27f61239bd41556ce7e147b.
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4