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

Change-Id: Ibdf05b7f50a5a04b5a6994fded638d0d39414a5d