Merge "Allow dumpstate to dump auto hal servers"