Merge "Do not create /sbin"