Merge "Make simpleperf build with LLVM r275480"
am: c27cccb8ef

Change-Id: Icd9afadf40fff33c7a70a5600c7130811b5a6046