Merge "tp: CEngine cleanup" into main am: 2ee9427024

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/2852425

Change-Id: I86f60bda6ce37b9561faad014af13be829960f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>