Merge "fs_mgr: overlayfs: const to kNames" am: 6aaff2fe7d
am: f3f8baffbb

Change-Id: I28ed07cc21ed1dbbb5f02adf62cfc0b11706cb52