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

Change-Id: I4bba06db4f3a3bd1a43692231ed4c8d11ddc2229