Merge "Added more functionality to dex file tracking"
am: 355b576569

Change-Id: I10d480a3f566d4fb1138f6784096fa9a1cee9879