Merge "simpleperf: avoid errors/warnings caused by sepolicy."
am: 2a16892192

Change-Id: Ia024783075a63762055e7ff07f3f811c03206d74