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

Change-Id: I768fa7bcd9d7a62a3d2c6984437678d834ff03ea