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

* commit '7584e9906308db18db924f0576e84707adf0cbf3':
  Lose setprop to toybox.