am 6994d3fa: am bf403968: Merge "Lose setprop to toybox."

* commit '6994d3fa7a077ac429312af07da759be56670273':
  Lose setprop to toybox.