Merge "Added more functionality to dex file tracking."