am 7d0297c0: am b379e8d1: Merge "Compaction cleanup for FindArrayClass."

* commit '7d0297c0897a409a51565f1a433d1f95609fe3c6':
  Compaction cleanup for FindArrayClass.