Merge "Remove obsolete comments about small and large object heaps." into honeycomb