am 4defe47e: am e9bcf0fa: Merge "Delete ClassHelper and fix compaction bug in GetDirectInterface"

* commit '4defe47e4637f54ac46a1e76b657654d9f31844e':
  Delete ClassHelper and fix compaction bug in GetDirectInterface