Merge "ART: Do not reopen oat file in ImageWriter::UpdateOatFile()."