Merge "libsparse: fix double free after block splitting" am: aa70ac106a am: c6c6f30beb am: c53e690ad0

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

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