Merge "Remove perfprofd support." into stage-aosp-master