Merge "Added more functionality to dex file tracking."
am: 836af6f53e

Change-Id: I5181ee7153d943239f744cd51ebc57a14932a63d