Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" am: bde9fc1787
am: bdd1ce8538

Change-Id: I53eb16e4e61e899dab6e99a05bec9c69b98ec1d9