Merge "Lose getprop to toybox."