Merge "fs_mgr: overlayfs stop adding rootcontext= to mount"