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

Change-Id: Ia09ef042d5fb0c6c4287ecbd403198c6bf6af2da