Merge "Allow adb shell user to collect vmstat"