Merge \"Launch ahat server before processing the heap dump.\"
am: 0abe10a59b

Change-Id: I051ad88d1460d129a5eb65fc36a6e28354bbc251