Merge "Update heap dump notes.  DO NOT MERGE." into gingerbread