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

Change-Id: I21ce188477bbe8fd15f03b23c1fb34440f785bac