Make packages non-native again

Change-Id: Ib334a9bc4f6e3e8ae2f6009b99030034f49d3605