am 99103fae: Merge "Follow up to "Add ISA directory to image and odex pathnames.""

* commit '99103fae2b4b3f6b1f2b2bb6542a023886cc3cb0':
  Follow up to "Add ISA directory to image and odex pathnames."