[automerger skipped] Merge Android R am: 9f50cf8d3c -s ours

am skip reason: Change-Id I3d367a3babc9cb7ac6dbea396f70e10c5651d50b with SHA-1 129dd212d0 is in history

Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1422381

Change-Id: I8bf565314b81c2edc140a1575c2d15f0d969af05