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

Change-Id: I40033bcc2cb689f5a704d367459fa7adf8409738