am b379e8d1: Merge "Compaction cleanup for FindArrayClass."

* commit 'b379e8d107b9131d9b6c7b48aea01f9866e4047b':
  Compaction cleanup for FindArrayClass.