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

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