Merge "Remove static GcRoot<>s from Class and ClassExt." am: a5359a3bf4
am: 5aace5b628

Change-Id: I3317de177748cedb792c796bb28d4729c5bc1a93