Merge "Analysis of multiple dex files of a package added" am: 7aa54496ed
am: 5652b37bc4

Change-Id: Icee04023d9bb8eadea93eb3554048ce6af06094e