Merge "Compaction cleanup for FindArrayClass."