Merge "Support replacing nested kernel structs" am: df901df77a

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

Change-Id: I2aefa3d030cb69d5f0f58bc85afc5dde3e0a0753