Merge "Allow __NR_perf_event_open" am: 3711469ec6
am: a1ad789fbb

Change-Id: Ieafefe6727ba46f7133c7be55d7861413d32112b