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

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