Merge "Include static fields when dumping class objects." into gingerbread