Merge "Dumpstate: convert to hidl implementation."