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

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