Merge "Support replacing nested kernel structs" am: df901df77a am: 0fc9a6cd64

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

Change-Id: If1e12db6b06470f81545bb1b9e2da06fcf0d20c6