Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5
am: 603b7ed470

Change-Id: I437b19505ba82d5c4cc3cc9849bd2514ad6d846d