Merge "Overridden packages shouldn't install vdex files either"