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

* commit '4a098bbe213e8640cd80941145cf0eb6ca39a869':
  rootdir: make sure the /oem mountpoint is always available