Merge "Remove perfprofd support." into stage-aosp-master am: 680c3dc33b
am: 0eb252349b

Change-Id: I6945eed37215140704e3d1efb10229b33fdc010a