Merge "Explicitly set generate_hashtree: false" am: c8b02e3bec

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1737093

Change-Id: If976b2740e65e055c2726f80a0087c211ec62083