[automerger skipped] Merge "Remove perfprofd support." into stage-aosp-master...
[automerger skipped] Merge "Remove perfprofd support." into stage-aosp-master am: 680c3dc3 am: 0eb25234
am: bbb6d4d7 -s ours
am skip reason: change_id I0406afadc0663ef3c07acafcdf40f76c9bba27bf with SHA1 5a12f19e is in history
Change-Id: I43b17107d3af0a7cb5f93f34a4d2d0d644c34f11