Merge "Fix the build with a newer LLVM." am: eed5e27c24

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2214887

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