Merge "libsparse: fix double free after block splitting" am: aa70ac10 am:...

Merge "libsparse: fix double free after block splitting" am: aa70ac10 am: c6c6f30b am: c53e690a am: da319194

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2506666



Change-Id: I656455a439e8a922c8f3dcdd7717156fb20ab8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>