Merge "simpleperf: fix cts tests build for aosp_x86*."