am 300432d2: Merge "Add class flags to class to help GC scanning"

* commit '300432d27ba9dd6961458fb1e1c845766f25c50a':
  Add class flags to class to help GC scanning