am 4c654695: Merge "Fix opening oat files that are out of date."

* commit '4c65469539a2bedc171ffc0e78de91a525436ccd':
  Fix opening oat files that are out of date.