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

Change-Id: I9857c7f9e48462b4e0e56c9eca3d877ad9610c76