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

Change-Id: I1332829476788b9a3f9cc3f6e51ece7f043448d4