Merge "toolbox: add setprop, start, and stop" am: d949bf8df3
am: be641e0d22

Change-Id: I9aac3bb9f3baea3662644c8cd80f213fac16d8c5