I think --with-package-format=native/portable can go away

Or does somebody know what they mean and even use either?

Change-Id: If935d5d6b53d1f95ec22b19b6b97f4ecfe4d9c06