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

Change-Id: I6176a2faa24be301a6e1459691e17e598b29a204