Merge "Add getprop to toolbox" am: acaeeeed73
am: 413f5138dd

Change-Id: I07438a76a9da90ef8e69d786677b20277003d106