Merge "ART: Refactor oat_file.h/cc for better maintainability"
am: dbec5e71e0

* commit 'dbec5e71e0108cff373dce9e315a95a0187bc14f':
  ART: Refactor oat_file.h/cc for better maintainability