Merge "Update for C11." am: 03689cc40e am: 61ff2feebd am: 642de20f5d Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I949c1d365ea706c2f4a41998a1a0019c9e6dccd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>