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