Merge changes I76ce981e,Ifd00d52e,Ibc6fa38b,Ic3aa6a74 am: f054b59641

Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/1600476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I411f41d7eed283fa863903fe6dfe2f40c6471cdf