Switch to our system/core & vendor/omni

Change-Id: I9076454cb9999dcf70b11b106e7ba569a0f7cc50