Merge "dumpsys: add --thread option"