Merge "Reland: Add getprop to toolbox"
am: eac86b0ea9

Change-Id: Ia0020e6f82e3ca801b191f5b54939dad05b5ebe1