Merge "emulator: enable simpleperf on aosp x86/64" am: 4d5214ec4f am: bef0acd25b
am: 8af2af653e

Change-Id: If79a9716b2e6c097c16f651383973b5a7af41028