Merge "Dumpstate: Refactor DumpHals" am: b0f2b48c0a
am: 432ff435a0

Change-Id: I6e1e552abbdcdd732ab4a0dfea4b0b3d0ea1d152