Merge "rootdir: make sure the /odm mountpoint is always available"
am: fcec40de0b

Change-Id: I29672e57f16e43449bcb868e463705f23bf1f722