Merge "Add getprop to toolbox"
am: acaeeeed73

Change-Id: I7f716eb136b6f19b3d8c18e13904e68d2a3d1392