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

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