am e4a1bd60: Merge "Fix perf build." * commit 'e4a1bd60030c01742957c781c99a016b1461c919': Fix perf build.