Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: 479bc8d487 am: 78d9ca4274 am: 434edd40f3 am: d98927ebaf

Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591

Change-Id: Icbc7de9b1e86016f2a594146046c21f34af5b299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>