Merge "Revert "Move tracing calls to libbinder_ndk"" into main