Merge "rootdir: make sure the /oem mountpoint is always available"