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

Change-Id: I0bf39c964ae56903f95ae7ec93995f91002d8da7