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

Change-Id: I9db9b5bcd72078909fd775b11ddd93352855bbe7