Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c
am: c9f676bc64

Change-Id: I669d213a9c2351183ebf28e2d7861d8e85daf649