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

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

Change-Id: Ibb6b1d626d4f3670b4e4588c7d120260f7eb3bfb