Merge "ART: Fix CompilerDriver::AreInSameOatFile()."