Merge "Remove perfprofd feature."
am: 8f300bae66

Change-Id: Id44518a994b166f6ceabce14349888b80c7ec01a