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

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

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