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

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