Improve overlapping detection in ZFile. am: 8efe1e8b1b am: e36e7b9886 am: 83ef266298 Change-Id: Ic186105b7e4e336eadba4faeb56cc6b57fb76edc