ANDROID: Merge remote-tracking branch 'aosp/upstream-libtracefs' am: 9b98f3d5b7 am: c331dc7ff3 am: e675a04bcf

Original change: https://android-review.googlesource.com/c/platform/external/libtracefs/+/2084923

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