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

Change-Id: If74a6013dcceca0f25e2ef47ca92572fdc22543e