Merge "Overridden packages shouldn't install vdex files either"
am: 01f4e20172

Change-Id: Ie96f6c6a82b28cf12fd61c39a1541a57e83beb0a