Merge "Remove perfprofd."
am: c111db3f8c

Change-Id: Ic0888f8d7c5d37d6b0a206f3c2e4c259959dc725