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

* commit '3adb5b13ea0512dfebee23b1b871b36396b3a8f0':
  Add class flags to class to help GC scanning