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

Change-Id: I4c5ac9f88263e619c3705c24c89ec85d2e13f42f