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