Merge "Clean up __stack_chk_fail_local slightly." am: 433293dbc9 am: e75355e03a

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

Change-Id: I5ac25c9c56163b3d98b873d4ac683390589f00e5