Merge "Dumpstate: Refactor DumpHals"
am: b0f2b48c0a

Change-Id: I8b6bcb887675d907e21bb818cf0408d54d975b14