Merge "Lose setprop to toybox."