Merge "fs_mgr: overlayfs stop adding rootcontext= to mount" am: afac3fe0b2
am: 068acefcfc

Change-Id: Ia8d7f4d4174cbc817a0818bf84cc10f8169c5093