Merge "Revert "Add getprop to toolbox"" am: fde1cee92e am: ea66b5520e
am: 0267907761

Change-Id: I08c61a05fc1f2af2c54c6f1599853ed4584b7082