Merge "Do not create /sbin"
am: 3016f2527c

Change-Id: I02cd6a8cc3daa04c382f09b50f17bb101c38bb34