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

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

Change-Id: Ia309baf561f3beeb46fdbfef12d7364e3784cf2d