Merge "Run HeapLocationCollector once in scheduler instead of locally."
am: 80dd7567f7

Change-Id: Icf6e75baab666277e9da6ae427ff0f9f9d4930b0