Merge "Revert "Disable test due to toybox update.""