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

Change-Id: Ie9f497ea6f8e04246796ffb6048007b0729fe045