Merge "Allow dumpstate to kill dumpstate vendor HAL in timeout case"