Merge "Overridden packages shouldn't install vdex files either" am: 01f4e20172 am: 5a8b1617ae am: e78154614c
am: 21ec75dbbe

Change-Id: Ibf26871a8b3752c287742c89105c355ea7f2a94d