am 19315c12: Merge "Clean up GC callbacks to be virtual methods"

* commit '19315c121047edcedf2828fea50f3208d799eca2':
  Clean up GC callbacks to be virtual methods