Merge "fs_mgr: overlayfs: test fix problems with runtime apex bind mounts" am: 49398d3444
am: d7db249567

Change-Id: I7fbbd248d34adb904772ff5d386d01a5e9335c08