Merge "Revert "Add getprop to toolbox""