Merge "fs_mgr: Make kDefaultAndroidDtDir constexpr" am: ef06b4fc7a am: c1ed1ebac7
am: 21024ea6a0

Change-Id: I2ac7ba99cd0eb78d8fb54ef97e26e645ec37ae48