Merge commit '7d3f633d' into gingerbread-plus-aosp * commit '7d3f633d': Include static fields when dumping class objects.