Merge "Fix tracking foreign dex files" into nyc-dev
am: 5546062

* commit '554606225a5d573f3a69648290c1a79fc3d5f196':
  Fix tracking foreign dex files

Change-Id: I263e69980e30947156b6a2779df49579c692f838