Merge "Fix tracking foreign dex files" into nyc-dev