Merge "Fix bug in OatFileAssistant::GetBestOatFile."