Merge "Revert "Use compiler filter to determine oat file status.""