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