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

Change-Id: Icbc30f9ed92163119307d7c5f25e06d9cd93e9a4