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

Change-Id: I7bcd1f0fc128eb6a8e8e980ac8492231db8886a8