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

Change-Id: I202e71842589b287156c1844b027fd169ddda21d