Merge "Add arguments to native dumpsys support"