Merge "fs_mgr: overlay: resize other OTA partitions to zero to make space" am: 9187a72175
am: b7fdfb1b67

Change-Id: I3bc967d4a1a40f37e03e343f35796ca420f3b592