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

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

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