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

Change-Id: Iede59b99737e643fd93ed7328b63cfe646187f98