Merge "simpleperf: prepare for selinux change."
am: f80bf86b1c

Change-Id: I06bc98c09f49e746eb062d95c2a71671cce8b4b8