Merge "applypatch: Fix a memory leak in ApplyImagePatch()."
am: 1bc0117755

Change-Id: Ifb081da2cbc7175454bb4059e41bb9c94d9b6512