Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev