Merge "fs_mgr: overlayfs_mount_scratch don't write to system_other" am: 55c083901d am: 5526da9d44
am: 4ebeeed084

Change-Id: I44f264f3aa084f90b53d6227d1e532aa67990ec1