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

Change-Id: I26fd811738d02b69e3105458d0bdab88bf7c0b5d