Merge commit '3db6149c' into gingerbread-plus-aosp * commit '3db6149c': Update heap dump notes. DO NOT MERGE.