Merge "fixup! Embed host liblz4.so in target_files" am: 51616276

Original change: https://android-review.googlesource.com/c/platform/build/+/2083403



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